Bug 69872 – GTK_WIDGET_SET_FLAGS should be deprecated

Add gtk_widget_has_grab() as replacement for GTK_WIDGET_HAS_GRAB().

diff --git a/gtk/gtk.symbols b/gtk/gtk.symbols
index bf2e861bbd12b3261978a42d194a536939d1de6c..64e69ab6635dec06cf941be70a9b19bb3bf16faf 100644 (file)
--- a/gtk/gtk.symbols
+++ b/gtk/gtk.symbols
@@ -5002,7 +5002,9 @@ gtk_widget_get_visible
 gtk_widget_get_visual
 gtk_widget_grab_default
 gtk_widget_grab_focus
+gtk_widget_has_default
 gtk_widget_has_focus
+gtk_widget_has_grab
 gtk_widget_has_screen
 gtk_widget_hide
 gtk_widget_hide_all
@@ -5099,7 +5101,6 @@ gtk_widget_set_has_window
 gtk_widget_get_has_window
 gtk_widget_set_can_default
 gtk_widget_get_can_default
-gtk_widget_has_default
 gtk_widget_set_can_focus
 gtk_widget_get_can_focus
 #endif

diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index 28422b2e28284af746f213446a4156fd5e5c5e9e..267bd40fd00fbfc5f9b075163be3c02a3cc5613c 100644 (file)
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -5471,6 +5471,27 @@ gtk_widget_grab_default (GtkWidget *widget)
     g_warning (G_STRLOC ": widget not within a GtkWindow");
 }
 
+/**
+ * gtk_widget_has_grab:
+ * @widget: a #GtkWidget
+ *
+ * Determines whether the widget is currently grabbing events, so it
+ * is the only widget receiving input events (keyboard and mouse).
+ *
+ * See also gtk_grab_add().
+ *
+ * Return value: %TRUE if the widget is in the grab_widgets stack
+ *
+ * Since: 2.18
+ **/
+gboolean
+gtk_widget_has_grab (GtkWidget *widget)
+{
+  g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE);
+
+  return (GTK_WIDGET_FLAGS (widget) & GTK_HAS_GRAB) != 0;
+}
+
 /**
  * gtk_widget_set_name:
  * @widget: a #GtkWidget

diff --git a/gtk/gtkwidget.h b/gtk/gtkwidget.h
index d5de8bd13c449bd56e767a6816afdfa1bcb1c39d..3a79f554b0851c71e4ba47b77d734d0b390bcc62 100644 (file)
--- a/gtk/gtkwidget.h
+++ b/gtk/gtkwidget.h
@@ -561,6 +561,8 @@ gboolean   gtk_widget_get_can_default     (GtkWidget           *widget);
 gboolean   gtk_widget_has_default         (GtkWidget           *widget);
 void       gtk_widget_grab_default        (GtkWidget           *widget);
 
+gboolean   gtk_widget_has_grab            (GtkWidget           *widget);
+
 void                  gtk_widget_set_name               (GtkWidget    *widget,
                                                         const gchar  *name);
 G_CONST_RETURN gchar* gtk_widget_get_name               (GtkWidget    *widget);